package com.banyuan;

public class Main {
    public static void main(String[] args) {
        System.out.println("Hello World");
        System.out.println("这是小程序分支");
        System.out.println("这是小程序分支");
        System.out.println("冲突master");
        System.out.println("小程序也冲突了");
        System.out.println("master修改");
        System.out.println("小程序修改");
        System.out.println("2021修改了");
         System.out.println("同事修改的");
          System.out.println("冲突修改了");
        
    }

}
